Finallize the project, but Still one problem to go