Improved execution order