Improved state transitions