Time-change step 2

Not debugged yet, but looks OK as it stands now