More fiddling with time stamps.