Update Challenge 2 and 3