Updated project and solution