Updates to 7 and challenge 8