v2.0 - Fixing horizontal swipe