Runtime optimization (3/28)

Runtime optimization