Chnaged the way time change is handled.