Initial revision of the solution