Added Solutions 16 and 17