Fixed skew and swipe logic