Updated the solution!