Optimize the Project part