Brought templates in line with mc changes.