Tightened up Challenge 9