Adapting to time changes

Adapting to time changes