Clean working facet version with comments