Runtime optimization (12/28)

Runtime optimization