1-23 and cpl tweaks to 1-22