Final version for the project (2)