update stuff to use new templates