Improved swiping. Not perfect yet