Changed to use Stopwatch for timing recording