Included changes in the solution