hopefully final updates to template switching