Removed all ori to make it tidier