     )
   )
 
-(defn time-up? [settings app hero]
-  (if (> 0 (first (get-in settings [:time])))
-    (merge hero {:life 0})
-    (do
-      (om/transact! app [:settings :time 0] (fn [old-time] (do
-                                                             (console-log old-time)
-                                                             (- old-time 0.04))))
-      hero
-          )))
+(defn time-up? [original-hero app hero]
+
+    (if (> 0 (get-in original-hero [:time 0]))
+      (update-in hero [:life] (fn [_] 0))
+      (update-in hero [:time 0] - 0.04)
+      )
+
+  )
 
 (defn game-over? [original-hero hero]
   (if (or (> 0 (get-in hero [:position :bottom]))

                 (dom/tbody nil
                            (dom/tr nil
                                    (dom/th nil "Red Trampoline")
                                    (om/build table-cell (:red-trampete settings) {:init-state {:options (mapv (fn [i] [i]) (range 1 7))}})
                                    )
                            (dom/tr nil
                                    (dom/th nil "Blue Trampoline")
                                    (om/build table-cell (:blue-trampete settings) {:init-state {:options (mapv (fn [i] [i]) (range 1 7))}})
                                    )
                            (dom/tr nil
                                    (dom/th nil "Spiel Dauer")
                                    (om/build table-cell (:time settings) {:init-state {:options (mapv (fn [i] [i]) (range 30 61))}})
                                    )
                            )


   :life 100
   :position (hero-start-position grid-content)
   :game-won false
   :time [60]
   }
  )

