Updated project 1. please refer to this folder