Add challenge 4 and 5