updated to add templates