Modified for compliance with total time fields.