Improved swipe & refactored