Updated project for working version