diff --git a/mission/controller/acs/Guidance.cpp b/mission/controller/acs/Guidance.cpp
index d861769d..158ee9f0 100644
--- a/mission/controller/acs/Guidance.cpp
+++ b/mission/controller/acs/Guidance.cpp
@@ -74,7 +74,7 @@ void Guidance::targetQuatPtg(ACS::SensorValues* sensorValues, ACS::OutputValues
 
 //	TEST SECTION !
 	double dcmTEST[3][3] = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
-	MatrixOperations<double>::multiply(&acsParameters.magnetorquesParameter.mtq0orientationMatrix, dcmTEST, dcmTEST, 3, 3, 3);
+	//MatrixOperations<double>::multiply(&acsParameters.magnetorquesParameter.mtq0orientationMatrix, dcmTEST, dcmTEST, 3, 3, 3);
 
 	MatrixOperations<double>::multiply(*dcmDot, *dcmEJ, *dcmEJDot, 3, 3, 3);
 	MatrixOperations<double>::multiplyScalar(*dcmEJDot, omegaEarth, *dcmEJDot, 3, 3);
diff --git a/mission/controller/acs/SensorValues.cpp b/mission/controller/acs/SensorValues.cpp
index f3a52dea..25f2d61f 100644
--- a/mission/controller/acs/SensorValues.cpp
+++ b/mission/controller/acs/SensorValues.cpp
@@ -28,7 +28,7 @@ ReturnValue_t SensorValues::update() {
 //	quatJB[3] = static_cast<double>(quaternion.value);
 //	quatJBValid = quaternion.isValid();
 
-	return RETURN_OK;
+	return returnvalue::OK;
 }
 }
 
diff --git a/mission/controller/acs/SensorValues.h b/mission/controller/acs/SensorValues.h
index 1a328e16..566eec81 100644
--- a/mission/controller/acs/SensorValues.h
+++ b/mission/controller/acs/SensorValues.h
@@ -5,11 +5,11 @@
 #ifndef SENSORVALUES_H_
 #define SENSORVALUES_H_
 
-#include <fsfw/src/fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 namespace ACS {
 
-class SensorValues: public HasReturnvaluesIF {
+class SensorValues{
 public:
 	SensorValues();
 	virtual ~SensorValues();
diff --git a/mission/controller/acs/control/Detumble.cpp b/mission/controller/acs/control/Detumble.cpp
index 8c3bdf86..8a15aa8a 100644
--- a/mission/controller/acs/control/Detumble.cpp
+++ b/mission/controller/acs/control/Detumble.cpp
@@ -43,7 +43,7 @@ ReturnValue_t Detumble::bDotLaw(const double *magRate, const bool *magRateValid,
 	double gain = detumbleCtrlParameters->gainD;
 	double factor = -gain / pow(VectorOperations<double>::norm(magField,3),2);
 	VectorOperations<double>::mulScalar(magRate, factor, magMom, 3);
-	return RETURN_OK;
+	return returnvalue::OK;
 
 }
 
@@ -60,6 +60,6 @@ ReturnValue_t Detumble::bangbangLaw(const double *magRate, const bool *magRateVa
 
 	}
 
-	return RETURN_OK;
+	return returnvalue::OK;
 
 }