exercise 6 and some content updates.