Simplified transition logic