Right. I am not sure about this. I was under the impression that we only need the "new and final" code to be in.

@rmbennett -- what do you think?