diff --git a/SSD1306Ui.cpp b/SSD1306Ui.cpp
index f301d277c5549c3be72159eec9e8c493cbbc08d2..c2c6e4a2a1c216f406284a3e2d11efa55f55594d 100644
--- a/SSD1306Ui.cpp
+++ b/SSD1306Ui.cpp
@@ -89,12 +89,8 @@ void SSD1306Ui::previousFrame() {
 
 
 // -/----- State information -----\-
-FrameState SSD1306Ui::getFrameState(){
-  return this->state.frameState;
-}
-
-int SSD1306Ui::getCurrentFrame(){
-  return this->state.currentFrame;
+SSD1306UiState SSD1306Ui::getUiState(){
+  return this->state;
 }
 
 
diff --git a/SSD1306Ui.h b/SSD1306Ui.h
index 6ffad32ac0b10113650aa071db4bc60947686e50..d3595fea6facb7eabd3aefc917d95ef6cf6a2a9a 100644
--- a/SSD1306Ui.h
+++ b/SSD1306Ui.h
@@ -199,7 +199,7 @@ class SSD1306Ui {
     void  previousFrame();
 
     // State Info
-    FrameState getUiState();
+    SSD1306UiState getUiState();
 
     int update();
 };