Improved orchestration algorithm