added some ori functionality