updated for swipe