TIME handling changes