Index: firmware/App/Controllers/Ejector.c
===================================================================
diff -u -r0e4a62ba24d906d9e5b33b293f93405b8c0391ce -r679ed8977c24e6ce6893e652a10ef97af82be2b0
--- firmware/App/Controllers/Ejector.c	(.../Ejector.c)	(revision 0e4a62ba24d906d9e5b33b293f93405b8c0391ce)
+++ firmware/App/Controllers/Ejector.c	(.../Ejector.c)	(revision 679ed8977c24e6ce6893e652a10ef97af82be2b0)
@@ -31,13 +31,13 @@
 // ********** private definitions **********
 
 #define EJECTOR_RETRACT_OP_TIME             ( ( MS_PER_SECOND * 5 ) / TASK_GENERAL_INTERVAL )   ///< Ejector retract operation interval.
-#define EJECTOR_EXTEND_OP_TIME              ( ( MS_PER_SECOND * 4 ) / TASK_GENERAL_INTERVAL )   ///< Ejector extend operation interval.
+#define EJECTOR_EXTEND_OP_TIME              ( ( MS_PER_SECOND * 10 ) / TASK_GENERAL_INTERVAL )  ///< Ejector extend operation interval.
 #define EJECTOR_BACKOFF_OP_TIME             ( 50 / TASK_GENERAL_INTERVAL )                      ///< Ejector back-off operation interval.
 #define EJECTOR_DATA_PUB_INTERVAL           ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Ejector data publish interval.
 #define DATA_PUBLISH_COUNTER_START_COUNT    13                                                  ///< Ejector data publish start counter.
 
 #define EJECTOR_RETRACT_MOTOR_SPEED_RPM     -350.0F                                             ///< Ejector motor retract speed (in RPM).
-#define EJECTOR_EXTEND_MOTOR_SPEED_RPM      350.0F                                              ///< Ejector motor extend speed (in RPM).
+#define EJECTOR_EXTEND_MOTOR_SPEED_RPM      162.5F                                              ///< Ejector motor extend speed (in RPM).
 #define EJECTOR_OFF_MOTOR_SPEED_RPM         0.0F                                                ///< Ejector motor extend speed (in RPM).
 
 /// Enumeration of ejector states.
@@ -437,7 +437,7 @@
 {
     EJECTOR_STATE_T state = EJECTOR_STATE_EXTENDING;
 
-    if ( ++ejectorOperationTimerCounter >= EJECTOR_RETRACT_OP_TIME )
+    if ( ++ejectorOperationTimerCounter >= EJECTOR_EXTEND_OP_TIME )
     {
         ejectorOperationTimerCounter = 0;
         setEjectorSpeed( EJECTOR_OFF_MOTOR_SPEED_RPM );
Index: firmware/App/Drivers/EjectorMotor.c
===================================================================
diff -u -r0e4a62ba24d906d9e5b33b293f93405b8c0391ce -r679ed8977c24e6ce6893e652a10ef97af82be2b0
--- firmware/App/Drivers/EjectorMotor.c	(.../EjectorMotor.c)	(revision 0e4a62ba24d906d9e5b33b293f93405b8c0391ce)
+++ firmware/App/Drivers/EjectorMotor.c	(.../EjectorMotor.c)	(revision 679ed8977c24e6ce6893e652a10ef97af82be2b0)
@@ -47,6 +47,7 @@
 #define EJECTOR_MOTOR_CONTROL_REVERSE_DIR             0x00          ///< Ejector motor control register bit for direction (1=fwd, 0=rev).
 #define EJECTOR_MOTOR_CONTROL_FORWARD_DIR             0x08          ///< Ejector motor control register bit mask for forward direction.
 #define EJECTOR_MOTOR_CONTROL_32TH_STEP               0x03          ///< Ejector motor control register bits for 1/32 micro-stepping mode.
+#define EJECTOR_MOTOR_CONTROL_FULL_STEP               0x00          ///< Ejector motor control register bits for full stepping mode.
 
 /// Control bits to run ejector motor in reverse direction
 static const U08 EJECTOR_MOTOR_CONTROL_RUN_REVERSE = EJECTOR_MOTOR_CONTROL_SLEEP_OFF |
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r0e4a62ba24d906d9e5b33b293f93405b8c0391ce -r679ed8977c24e6ce6893e652a10ef97af82be2b0
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 0e4a62ba24d906d9e5b33b293f93405b8c0391ce)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 679ed8977c24e6ce6893e652a10ef97af82be2b0)
@@ -214,17 +214,18 @@
 
     if ( FALSE == bpStart )
     {
-        setBloodPumpTargetRPM( 1200, MOTOR_DIR_FORWARD );
-//        homeEjector();
-//        retractEjector();
+//        setBloodPumpTargetRPM( 1200, MOTOR_DIR_FORWARD );
+        homeEjector();
+        retractEjector();
         bpStart = TRUE;
     }
     if ( TRUE == bpStop )
     {
         signalBloodPumpHardStop();
-        setAirPumpState( AIR_PUMP_STATE_ON, AIR_PUMP_MOTOR_OFF );
-        set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-        set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+//        setAirPumpState( AIR_PUMP_STATE_ON, AIR_PUMP_MOTOR_OFF );
+//        set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+//        set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+        extendEjector();
         bpStop = FALSE;
     }