Improved.
Improved solution.