Added Challenge 2 and 3