updated with show 24, 25 & 26