Updated project with working version