            (swap! state assoc-in [:rooms :bedroom :lights-off?] true)
            (swap! state assoc-in [:rooms :bathroom :lights-off?] true)
            (swap! state assoc-in [:rooms :garage :car-in?] false)
-           (swap! state assoc :scenario "Scenario 8: The user prefers to see the weather in the morning.")
+           (swap! state assoc :scenario "Scenario 8a: The inhabitant prefers to see the weather in the morning.")
            (<! (timeout 2000))
            (swap! state assoc-in [:rooms :bedroom :lights-off?] false)
            (<! (timeout 2000))
-           (swap! state assoc :view :weather)
-           (swap! state assoc :scenario "Scenario 8: The weather view is presented.")
+           (morning-weather)
+           (swap! state assoc :scenario "Scenario 8b: The weather view is presented.")
            (<! (timeout 8000))
 
            ; door and garage port locked at night
            (reset! state initial-state)
-           (swap! state assoc-in [:rooms :garage-port :port-closed?] false)
+           (swap! state assoc-in [:rooms :garage :port-closed?] false)
            (swap! state assoc-in [:rooms :hall :front-door-locked?] false)
+           (swap! state assoc :time "22:00")
            (swap! state assoc :scenario
-                  "Scenario 9: The user has created a rule,
+                  "Scenario 9a: The inhabitant has created a rule,
                   stating that the front door and the garage port shall be automatically locked at 22:00.")
            (<! (timeout 3000))
-           (swap! state assoc-in [:rooms :garage :port-closed?] true)
-           (swap! state assoc-in [:rooms :garage :lights-off?] true)
-           (swap! state assoc-in [:rooms :hall :front-door-locked?] true)
-           (<! (timeout 2000))
-           (swap! state assoc :scenario "Scenario 9: At 22:00, the front door and garage port are locked.")
+           (lock-doors-at-night)
+           (<! (timeout 2000))
+           (swap! state assoc :scenario "Scenario 9b: At 22:00, the front door and garage port are locked.")
            (<! (timeout 8000))
 
            (recur)))

           (<! (timeout 2000))
           (swap! state assoc-in [:rooms :bathroom :laundry :whites] 100)
           (<! (timeout 2000))
           (swap! state assoc :view :bathroom)
           (swap! state assoc :scenario "Scenario 4: The laundry is full and the bathroom view is presented.")
           (<! (timeout 8000))

           ; burglary alarm

           (swap! state assoc-in [:rooms :bedroom :lights-off?] true)
           (swap! state assoc-in [:rooms :bathroom :lights-off?] true)
           (swap! state assoc-in [:rooms :garage :car-in?] false)
           (swap! state assoc :scenario "Scenario 3a: The inhabitant is not at home.")
           (<! (timeout 4000))
           (shopping)
           (swap! state assoc :scenario
                  "Scenario 3b: When she visits the website, the shopping list is shown.")
           (<! (timeout 8000))

           ; laundry
           (reset! state initial-state)
           (swap! state assoc :scenario
                  "Scenario 4a: The inhabitatnt has the day off and the white clothes laundry is about to be full.")
           (swap! state assoc-in [:rooms :bathroom :laundry :whites] 54)
           (swap! state assoc-in [:rooms :bathroom :laundry :colors] 63)
           (<! (timeout 2000))
