Updated Challenge 1 solution