update to match templates refactor