Beefing up state transitions