Added 16, 17, and 18