Re-working the state transitions