Updating the solution and the project as of 09/15/2014