Completed Challenge 2 & updated code from challenge 1