Improved swipe