made some changes looks like the project will be late though