Added all the new template --actually Ben