Add solutions for 21-22