Made Further Changes to Assigment1