Added solutions for 16-17.