slight refactor. started in on templates