diff --git a/syringefilled.cpp b/syringefilled.cpp
index 790fba9b2258104d650e4831bd8f66cd4e9fa878..9dd5662c92873af65c237d91fb5f5704609d92d7 100644
--- a/syringefilled.cpp
+++ b/syringefilled.cpp
@@ -38,7 +38,12 @@ void SyringeFilled :: set_screw_thread_mm(float screw_thread_mm)
 
 void SyringeFilled :: set_clockwise_equals_forward(bool clockwise_equals_forward)
 {
-    SyringeFilledJSON["clockwise_equals_forward"] = clockwise_equals_forward;
+    SyringeFilledJSON["clockwise_equals_push"] = clockwise_equals_push;
+}
+
+void SyringeFilled :: set_emergency(bool emergency)
+{
+    SyringeFilledJSON["emergency"] = emergency;
 }
 
 
@@ -78,6 +83,10 @@ bool SyringeFilled :: get_clockwise_equals_forward()
     return SyringeFilledJSON["clockwise_equals_forward"].as<float>();
 }
 
+bool SyringeFilled :: get_emergency()
+{
+    return SyringeFilledJSON["emergency"].as<bool>();
+}
 
 
 void SyringeFilled :: setupJsonSyringeFilled(float exchange_throughput_uL_per_sec, float exchange_volume_mL, float remaining_volume_mL, bool push, Syringe* id_syringe,  float screw_thread_mm, bool clockwise_equals_forward)
diff --git a/syringefilled.h b/syringefilled.h
index 8cf227f71921d3956a1312bdff1fa2123b21b286..924b2b55bbfbe1159d880560ec119ee53ee80144 100644
--- a/syringefilled.h
+++ b/syringefilled.h
@@ -32,6 +32,8 @@ class SyringeFilled : public Motor
     bool _clockwise_equals_forward;
 
 
+    //Limit_Switch
+    bool _emergency;
 
     public :
     /*
@@ -48,6 +50,7 @@ class SyringeFilled : public Motor
     void set_id_syringe(Syringe* id_syringe);
     void set_screw_thread_mm(float screw_thread_mm);
     void set_clockwise_equals_forward(bool clockwise_equals_forward);
+    void set_emergency(bool emergency);
 
 
     //GET METHODS
@@ -57,7 +60,8 @@ class SyringeFilled : public Motor
     bool get_push();
     Syringe* get_id_syringe();
     float get_screw_thread_mm();
-    bool get_clockwise_equals_forward();
+    bool get_clockwise_equals_push();
+    bool get_emergency();
 
 
     //JSON DOCUMENT