Optimising for run-time