Finished up to exercise 6