Updated code to latest stopwatch from Katherine