Slight improvement to problem 22
Solved problem 20