made changes to the solution as a whole