Challenge 5 and update to challenge 2