Runtime optimization (10/28)

Runtime optimization