fix up all since tags please, this is NX 3 code now