Update project 2 and editing some issue of project1