More improvements.
Another set of improvement.