yes, that's correct.  I have updated this particular code - so Mark can follow suit in the other templates.