Runtime optimization (16/28)

Runtime optimization