Optimizations with adjusting the time.
Update to 2.2.