diff --git a/gmoccapy_postgui.hal b/gmoccapy_postgui.hal
index 3d90ca8dd3b5f17082c1906cdfc8f5a46d79e6fc..89b4ab5cd8a019ae64bf458c95b7449c7cfe4740 100755
--- a/gmoccapy_postgui.hal
+++ b/gmoccapy_postgui.hal
@@ -62,6 +62,7 @@ setp			gmoccapy.spindle.spindle-override.analog-enable true
 net SpindleOverride	gmoccapy.spindle.spindle-override.direct-value
 
 net spindle-vel-fb-rpm-abs	gmoccapy.spindle_feedback_bar
+net spindle-at-speed		gmoccapy.spindle_at_speed_led
 
 net PanelKey		gmoccapy.unlock-settings
 
diff --git a/maurice.hal b/maurice.hal
index de156297959785bf354bafe8b2bae689a0cb14f1..aa2d81146ea95d4faf79bf9e24a56cf8e4757f21 100644
--- a/maurice.hal
+++ b/maurice.hal
@@ -14,7 +14,7 @@ loadrt conv_s32_float count=3
 loadrt scale names=FeedScale,RapidScale,SpindleScale
 loadrt and2 names=EstopAnd
 
-loadusr atv_vfd -r 9600 -p even
+loadusr atv_vfd -r 38400 -p even
 
 addf motion-command-handler servo-thread
 addf motion-controller servo-thread
diff --git a/mesa.hal b/mesa.hal
index 100d686a1b802a5919e2b57e503d995956704bc6..6849161c3ea459524950ca1384f1ed27fd30b551 100644
--- a/mesa.hal
+++ b/mesa.hal
@@ -1,6 +1,6 @@
 #Load Hostmot support 
 loadrt hostmot2
-loadrt hm2_pci config="num_encoders=2 num_pwmgens=0"
+loadrt hm2_pci config="num_encoders=2 num_pwmgens=1"
 loadrt mux8 names=mpg
 loadrt abs count=1
 loadrt near names=atspeed
@@ -11,12 +11,35 @@ addf mpg		servo-thread
 addf atspeed		servo-thread
 addf abs.0		servo-thread
 
+setp			hm2_5i24.0.pwmgen.pwm_frequency 24000
+setp			hm2_5i24.0.pwmgen.pdm_frequency 6000000
+
 #We have a 6i24 in emulation mode so all pin will be hm2_5i24.0.
 
 ####################################################################
 #Spindle handling
 ####################################################################
 
+######
+#net spindle-vel-cmd-rps			spindle.0.speed-out-rps
+#net spindle-vel-cmd-rps-abs		spindle.0.speed-out-rps-abs
+#net spindle-vel-cmd-rpm			spindle.0.speed-out
+#net spindle-vel-cmd-rpm-abs		spindle.0.speed-out-abs
+#net spindle-enable			spindle.0.on
+#net spindle-cw				spindle.0.forward
+#net spindle-ccw				spindle.0.reverse
+#net spindle-brake			spindle.0.brake
+#net spindle-revs			spindle.0.revs
+#net spindle-at-speed			spindle.0.at-speed
+#net spindle-vel-fb-rps			spindle.0.speed-in
+#net spindle-index-enable		spindle.0.index-enable
+######
+
+#setp				hm2_5i24.0.pwmgen.00.output-type 2
+#setp				hm2_5i24.0.pwmgen.00.scale 6000
+#net spindle-vel-cmd-rpm		hm2_5i24.0.pwmgen.00.value
+#net spindle-enable		hm2_5i24.0.pwmgen.00.enable
+
 setp 				hm2_5i24.0.encoder.00.scale 4096
 net spindle-revs		hm2_5i24.0.encoder.00.position
 net spindle-vel-fb-rps		hm2_5i24.0.encoder.00.velocity