8, 15, and 16 updated