Adjusted how the time is calculated and displayed