Orchestrator improved