Final Project1 version 2.0