Updated project and exercises