refactored memberships to locations