diff --git a/source/shoh/src/threads/relay/Relay.cpp b/source/shoh/src/threads/relay/Relay.cpp
index a8733b0..12a4640 100644
--- a/source/shoh/src/threads/relay/Relay.cpp
+++ b/source/shoh/src/threads/relay/Relay.cpp
@@ -87,29 +87,21 @@ void Relay::taskFunction()
 	}
 }
 
-void Relay::parseEvent(Event* d)
+void Relay::parseEvent(Event* e)
 {
-	for (uint8_t i = Event::ExternalTemp; i <= Event::SetPoint; i++)
-		{
-			EventRawData rd = d->getDataOf(static_cast<Event::EventType>(i));
-			if(rd == ERROR_RETURN)
-			{
-				continue;
-			}
-			switch(i /* EventType */)
-			{
-				case Event::ExternalTemp:
-					ext_temp = rd;
-					break;
-				case Event::SetPoint:
-					setpoint = rd;
-					break;
-				default:
-					assert(0);
-					break;
-			}
-		
-		}
+	EventRawData rd = e->getData();
+	switch(e->getType() /* EventType */)
+	{
+		case Event::ExternalTemp:
+			ext_temp = rd;
+			break;
+		case Event::SetPoint:
+			setpoint = rd;
+			break;
+		default:
+			assert(0);
+			break;
+	}	
 }
 
 void Relay::utilizeEventData()
diff --git a/source/shoh/src/threads/relay/Relay.h b/source/shoh/src/threads/relay/Relay.h
index 5ee61d4..c626ff7 100644
--- a/source/shoh/src/threads/relay/Relay.h
+++ b/source/shoh/src/threads/relay/Relay.h
@@ -51,7 +51,7 @@ private:
 	RelayDevice relays [2] = {{0, 24, 0},
 							  {0, 26, 1}};
 
-	void parseEvent(Event * d);
+	void parseEvent(Event * e);
 	int8_t setpoint, ext_temp;
 };