Solution restructured.