Update to challenge 6