diff --git a/apps/speedalt/app.js b/apps/speedalt/app.js
index 6c9f4aa3e..f9d69f64e 100644
--- a/apps/speedalt/app.js
+++ b/apps/speedalt/app.js
@@ -2,7 +2,7 @@
 Speed and Altitude [speedalt]
 Mike Bennett mike[at]kereru.com
 */
-var v = '1.05';
+var v = '1.06';
 var buf = Graphics.createArrayBuffer(240,160,2,{msb:true});
 
 // Load fonts
@@ -11,7 +11,7 @@ require("Font7x11Numeric7Seg").add(Graphics);
 var lf = {fix:0,satellites:0};
 var showMax = 0;        // 1 = display the max values. 0 = display the cur fix
 var pwrSav = 1;         // 1 = default power saving with watch screen off and GPS to PMOO mode. 0 = screen kept on.
-var maxPress = 0;      // Time max button pressed. Used to calculate short or long press.
+// var maxPress = 0;      // Time max button pressed. Used to calculate short or long press.
 var canDraw = 1;
 var time = '';    // Last time string displayed. Re displayed in background colour to remove before drawing new time.
 var tmrLP;            // Timer for delay in switching to low power after screen turns off
@@ -281,9 +281,20 @@ function togglePwrSav() {
 function setButtons(){
 
   // Spd+Dist : Select next waypoint
-  setWatch(btnPressed, BTN1,{repeat:true,edge:"rising"});
-  setWatch(btnReleased, BTN1,{repeat:true,edge:"falling"});
-
+//  setWatch(btnPressed, BTN1,{repeat:true,edge:"rising"});
+//  setWatch(btnReleased, BTN1,{repeat:true,edge:"falling"});
+  setWatch(function(e) {
+    var dur = e.time - e.lastTime;
+    if ( settings.modeA ) {
+      // Spd+Alt mode - Switch between fix and MAX
+      if ( dur < 2 ) showMax = !showMax;   // Short press toggle fix/max display
+      else { max.spd = 0; max.alt = 0; }  // Long press resets max values.
+    }
+    else nxtWp(1);  // Spd+Dist mode - Select next waypoint
+    onGPS(lf);
+  }, BTN1, { edge:"falling",repeat:true});
+  
+  
   // Show launcher when middle button pressed
   setWatch(Bangle.showLauncher, BTN2, {repeat:false,edge:"falling"});
 
@@ -298,10 +309,12 @@ function setButtons(){
   
 }
 
+/*
 function btnPressed() {
   maxPress = getTime();
 }
 
+
 function btnReleased() {
   var dur = getTime()-maxPress;
   if ( settings.modeA ) {
@@ -313,6 +326,7 @@ function btnReleased() {
   
   onGPS(lf);
 }
+*/
 
 function updateClock() {
   if (!canDraw) return;