more improvement on TimeMachine