Slight changes to Time Management