Updated a template, looking for bugs.