Assig 7.1 finished