1-24 and tweaks to 1-23