updated challenge 1 solutions