Split main orchestator into more steps