Revised timekeeping subroutines