Brought the old NL templates up to current specification