Tweaking the time only handling