added timer + api changes