Runtime optimization (15/28)

Runtime optimization