Runtime optimization (11/28)

Runtime optimization