assginment 7&8 changes made