diff --git a/heating/heizungen.rules b/heating/heizungen.rules
index 7951e4e..4f86a9d 100644
--- a/heating/heizungen.rules
+++ b/heating/heizungen.rules
@@ -1,4 +1,4 @@
-// Turn on heating if someone is at home
+// Turn on heating if window is closed and someone is at home
 rule "Heizung Wohnzimmer ein"
 	when
 		Time cron "0 30  6 ? * MON" or
@@ -10,25 +10,25 @@ rule "Heizung Wohnzimmer ein"
 		Time cron "0  0  8 ? * SUN"
 	then
 		ThermostatEGWohnzimmer_Status.sendCommand(ON)
-		if (Presence_Overall.state==ON) {
+		if (Presence_Overall.state==ON && XiaomiAqaraDoorWindowSensorEGWohnzimmerFenster_OpenStatus.state==CLOSED) {
 			sendCommand(ThermostatEGWohnzimmer_4_SetTemperature, 19)
 		}
 end
 
-// Turn on heating if someone returns home during heating time period
+// Turn on heating during heating time period if window is closed or someone returns home
 rule "Heizung Wohnzimmer ein 2"
 	when
-		Item Presence_Overall changed to ON
+		Item Presence_Overall changed to ON or
+		Item XiaomiAqaraDoorWindowSensorEGWohnzimmerFenster_OpenStatus changed to CLOSED
 	then
-		if (ThermostatEGWohnzimmer_Status.state==ON) {
+		if (ThermostatEGWohnzimmer_Status.state==ON && XiaomiAqaraDoorWindowSensorEGWohnzimmerFenster_OpenStatus.state==CLOSED) {
 			sendCommand(ThermostatEGWohnzimmer_4_SetTemperature, 19)
 		}
 end
 
-// Turn off (turn to a lower temperature) heating if everybody has left home or heating time period is over
+// Turn off (turn to a lower temperature) heating if heating time period is over
 rule "Heizung Wohnzimmer aus"
 	when
-		Item Presence_Overall changed to OFF or
 		Time cron "0  0 22 ? * MON" or
 		Time cron "0  0 22 ? * TUE" or
 		Time cron "0  0 22 ? * WED" or
@@ -43,6 +43,17 @@ rule "Heizung Wohnzimmer aus"
 		}
 end
 
+// Turn off (turn to a lower temperature) heating if window is opened or everybody has left home
+rule "Heizung Wohnzimmer aus 2"
+	when
+		Item Presence_Overall changed to OFF or
+		Item XiaomiAqaraDoorWindowSensorEGWohnzimmerFenster_OpenStatus changed to OPEN
+	then
+		if (TV_Power.state==OFF) {
+			sendCommand(ThermostatEGWohnzimmer_4_SetTemperature, 16)
+		}
+end
+
 // Turn off (turn to a lower temperature) heating after TV has turned off
 rule "Heizung Wohnzimmer aus TV aus"
 	when