more changes to get swipe to work