added timer support