removed conditional from template