maybe add a non-org-scoped ep for consistency?