making <context> based orgs work