orchestration improvements