Now using unscaled time where appropriate.