Still fixing QuickSwipe