updated 24, 25, and 26