Runtime optimization (2/28)

Runtime optimization