Yet more version work