ProgrammingAssignment2-modified