add some pieces of templates back in