added timer-feature