Runtime optimization (17/28)

Runtime optimization