Initial Challenge 7 fixed