Added a lot of modification to the project