updated to newer StopWatch