Cleaned up behavior without rotation