improved the orchestrator