Time handling changed