Big changes for Sawtooth NF