Added challenge 5 and 6