refactored the facets