replace timer with handler
minor
some fix