Removed ActionPhaseO
Swap Either and State