Orchestration + fix bug