fix timing bug by setting start time in tracker
refactoring