Solve challenge 6
Solve challenge 7