Challenge 7 and 6