Runtime optimization (22/28)

Runtime optimization