diff --git a/Step/wwwroot/src/_base/gestures.js b/Step/wwwroot/src/_base/gestures.js
index 8b41ceff..1f9ca4fb 100644
--- a/Step/wwwroot/src/_base/gestures.js
+++ b/Step/wwwroot/src/_base/gestures.js
@@ -7,13 +7,14 @@ function swipedetect(el, callback, onmovecallback) {
         swipedir,
         startX,
         startY,
+        lastXswipe,
+        lastYswipe,
         distX,
         distY,
         threshold = 10, //required min distance traveled to be considered swipe
         restraint = 1000, // maximum distance allowed at the same time in perpendicular direction
         allowedTime = 300, // maximum time allowed to travel that distance
         elapsedTime,
-        startTime,
         handleswipe = callback || function(swipedir) {}
 
     touchsurface.addEventListener('touchstart', function(e) {
@@ -23,21 +24,27 @@ function swipedetect(el, callback, onmovecallback) {
         distY = 0
         startX = touchobj.pageX
         startY = touchobj.pageY
-        startTime = new Date().getTime() // record time when finger first makes contact with surface
+        lastXswipe = touchobj.pageX
+        lastYswipe = touchobj.pageY
         e.preventDefault()
     }, false)
 
     touchsurface.addEventListener('touchmove', function(e) {
         e.preventDefault() // prevent scrolling when inside DIV
-
+        
         var touchobj = e.changedTouches[0];
-        if (Math.abs(distX) >= threshold && Math.abs(distY) <= restraint) { // 2nd condition for horizontal swipe met
-            swipedir = (distX < 0) ? 'left' : 'right' // if dist traveled is negative, it indicates left swipe
-            startX = touchobj.pageX
-        } else if (Math.abs(distY) >= threshold && Math.abs(distX) <= restraint) { // 2nd condition for vertical swipe met
-            swipedir = (distY < 0) ? 'up' : 'down' // if dist traveled is negative, it indicates up swipe
-            startY = touchobj.pageY
+        distX = touchobj.pageX - lastXswipe;
+        distY = touchobj.pageY - lastYswipe;
+
+        if (Math.abs(distY) >= threshold && Math.abs(distX) < restraint) {
+            swipedir = (distY < 0) ? 'up' : 'down'
         }
+        if (Math.abs(distX) >= threshold && Math.abs(distY) < restraint) {
+            swipedir = (distX < 0) ? 'left' : 'right'            
+        }
+
+        lastXswipe = touchobj.pageX
+        lastYswipe = touchobj.pageY
 
         if (onmovecallback)
             onmovecallback(e)
@@ -46,15 +53,6 @@ function swipedetect(el, callback, onmovecallback) {
 
     touchsurface.addEventListener('touchend', function(e) {
         var touchobj = e.changedTouches[0]
-        distX = touchobj.pageX - startX // get horizontal dist traveled by finger while in contact with surface
-        distY = touchobj.pageY - startY // get vertical dist traveled by finger while in contact with surface
-        elapsedTime = new Date().getTime() - startTime // get time elapsed
-
-        if (Math.abs(distX) >= threshold && Math.abs(distY) <= restraint) { // 2nd condition for horizontal swipe met
-            swipedir = (distX < 0) ? 'left' : 'right' // if dist traveled is negative, it indicates left swipe
-        } else if (Math.abs(distY) >= threshold && Math.abs(distX) <= restraint) { // 2nd condition for vertical swipe met
-            swipedir = (distY < 0) ? 'up' : 'down' // if dist traveled is negative, it indicates up swipe
-        }
 
         handleswipe(swipedir)
         e.preventDefault()