diff --git a/container/FIFO.h b/container/FIFO.h
index 00f56993..889d2ade 100644
--- a/container/FIFO.h
+++ b/container/FIFO.h
@@ -59,6 +59,26 @@ public:
 			return HasReturnvaluesIF::RETURN_OK;
 		}
 	}
+
+	ReturnValue_t peek(T * value) {
+	    if(empty()) {
+	        return EMPTY;
+	    } else {
+	       *value = data[readIndex];
+	       return HasReturnvaluesIF::RETURN_OK;
+	    }
+	}
+
+	ReturnValue_t pop() {
+	    if(empty()) {
+	        return EMPTY;
+	    } else {
+	        readIndex = next(readIndex);
+	        --currentSize;
+	        return HasReturnvaluesIF::RETURN_OK;
+	    }
+	}
+
 	static const uint8_t INTERFACE_ID = CLASS_ID::FIFO_CLASS;
 	static const ReturnValue_t FULL = MAKE_RETURN_CODE(1);
 	static const ReturnValue_t EMPTY = MAKE_RETURN_CODE(2);
diff --git a/timemanager/Stopwatch.h b/timemanager/Stopwatch.h
index 786a9d57..f48c04ec 100644
--- a/timemanager/Stopwatch.h
+++ b/timemanager/Stopwatch.h
@@ -56,12 +56,13 @@ public:
 
     StopwatchDisplayMode getDisplayMode() const;
     void setDisplayMode(StopwatchDisplayMode displayMode);
+    bool displayOnDestruction = true;
 private:
     timeval startTime {0, 0};
     timeval elapsedTime {0, 0};
 
     StopwatchDisplayMode displayMode = StopwatchDisplayMode::MILLIS;
-    bool displayOnDestruction = true;
+
     void stopInternal();
 };