Some old changes regarding the clock