Runtime optimization (5/28)

Runtime optimization