file edited for Prog assignment 2