Work on facets, better but still not perfect