Changed 16,17,20,21