more work on swipe ++