Runtime optimization (4/28)

Runtime optimization