Runtime optimization (18/28)

Runtime optimization