Solved challenge 21
Solved challenge 24