Added final solution