Update ChangeTime to be better