Runtime optimization (24/28)

Runtime optimization