This version now does things the same way as TS23