--- before ontology change