diff --git a/AlignEq.ino b/AlignEq.ino
index f714b5970..dd9b6d201 100644
--- a/AlignEq.ino
+++ b/AlignEq.ino
@@ -275,12 +275,12 @@ void TGeoAlign::autoModel(int n) {
   }
   ohe=ohe/num; best_ohe=round(ohe*Rad*3600.0); best_ohw=best_ohe;
 
-#if defined(MOUNT_TYPE_FORK) || defined(MOUNT_TYPE_FORK_ALT) || defined(MOUNT_TYPE_ALTAZM)
+#if defined(MOUNT_TYPE_FORK) || defined(MOUNT_TYPE_FORK_ALT)
   Ff=1; Df=0;
 #else
   Ff=0; Df=1;
 #endif
-  
+
   // search, this can handle about 9 degrees of polar misalignment, and 4 degrees of cone error
   //              DoPdPzPeTfFf Df OdOh
   do_search(16384,0,0,1,1,0, 0, 0,1,1);
@@ -297,14 +297,20 @@ void TGeoAlign::autoModel(int n) {
   if (num>4) {
     //              DoPdPzPeTfFf Df OdOh
     do_search(  256,1,1,1,1,0,Ff,Df,1,1);
-    do_search(  128,1,1,1,1,0,Ff,Df,1,1);
-    do_search(   64,1,1,1,1,0,Ff,Df,1,1);
-    do_search(   32,1,1,1,1,0,Ff,Df,1,1);
+    do_search(  128,1,1,1,1,1,Ff,Df,1,1);
+    do_search(   64,1,1,1,1,1,Ff,Df,1,1);
+#ifdef HAL_FAST_PROCESSOR
+    do_search(   32,1,1,1,1,1,Ff,Df,1,1);
+    do_search(   16,1,1,1,1,1,Ff,Df,1,1);
+#endif
   } else {
     do_search(  256,1,0,1,1,0, 0, 0,1,1);
     do_search(  128,1,0,1,1,0, 0, 0,1,1);
     do_search(   64,1,0,1,1,0, 0, 0,1,1);
     do_search(   32,1,0,1,1,0, 0, 0,1,1);
+#ifdef HAL_FAST_PROCESSOR
+    do_search(   16,1,0,1,1,0, 0, 0,1,1);
+#endif
   }
 #endif
 
diff --git a/AlignHor.ino b/AlignHor.ino
index e42047c0a..2eb869154 100644
--- a/AlignHor.ino
+++ b/AlignHor.ino
@@ -289,11 +289,8 @@ void TGeoAlignH::autoModel(int n) {
   }
   ohe=ohe/num; best_ohe=round(ohe*Rad*3600.0); best_ohw=best_ohe;
 
-#if defined(MOUNT_TYPE_FORK) || defined(MOUNT_TYPE_FORK_ALT) || defined(MOUNT_TYPE_ALTAZM)
-  Ff=1; Df=0;
-#else
-  Ff=0; Df=1;
-#endif
+  // these don't apply for Alt/Az
+  Ff=0; Df=0;
   
   // search, this can handle about 9 degrees of polar misalignment, and 4 degrees of cone error
   //              DoPdPzPeTfFf Df OdOh
@@ -311,14 +308,20 @@ void TGeoAlignH::autoModel(int n) {
   if (num>4) {
     //              DoPdPzPeTfFf Df OdOh
     do_search(  256,1,1,1,1,0,Ff,Df,1,1);
-    do_search(  128,1,1,1,1,0,Ff,Df,1,1);
-    do_search(   64,1,1,1,1,0,Ff,Df,1,1);
-    do_search(   32,1,1,1,1,0,Ff,Df,1,1);
+    do_search(  128,1,1,1,1,1,Ff,Df,1,1);
+    do_search(   64,1,1,1,1,1,Ff,Df,1,1);
+#ifdef HAL_FAST_PROCESSOR
+    do_search(   32,1,1,1,1,1,Ff,Df,1,1);
+    do_search(   16,1,1,1,1,1,Ff,Df,1,1);
+#endif
   } else {
     do_search(  256,1,0,1,1,0, 0, 0,1,1);
     do_search(  128,1,0,1,1,0, 0, 0,1,1);
     do_search(   64,1,0,1,1,0, 0, 0,1,1);
     do_search(   32,1,0,1,1,0, 0, 0,1,1);
+#ifdef HAL_FAST_PROCESSOR
+    do_search(   16,1,0,1,1,0, 0, 0,1,1);
+#endif
   }
 #endif
 
diff --git a/src/HAL/HAL_Teensy_3/HAL_Teensy_3.h b/src/HAL/HAL_Teensy_3/HAL_Teensy_3.h
index e0a51b283..e93061176 100644
--- a/src/HAL/HAL_Teensy_3/HAL_Teensy_3.h
+++ b/src/HAL/HAL_Teensy_3/HAL_Teensy_3.h
@@ -4,10 +4,12 @@
 #define __ARM_Teensy3__
 
 // Lower limit (fastest) step rate in uS for this platform
-#if defined(__MK64FX512__) || defined(_mk20dx128_h_) || defined(__MK20DX128__)
+#if defined(__MK64FX512__) 
   #define MaxRate_LowerLimit 12
+  #define HAL_FAST_PROCESSOR
 #elif defined(__MK66FX1M0__)
   #define MaxRate_LowerLimit 4
+  #define HAL_FAST_PROCESSOR
 #else
   #define MaxRate_LowerLimit 16
 #endif