remake: changed timer into hanlder

remake: changed timer into hanlder