Updated for challenge 9