edited file for assignment 2