Updated version of the project

imported the current working version