final commit for 1st iteration