(#6) - components for templates now flagged