Added a final solution