Runtime optimization (19/28)

Runtime optimization