Solution improvement

and more report