completed changes to all facets for demo