Rearranged templates and adjusted models.