replaced manual time tracking with stopwatch