Add challenge 3 and 4