Update to OR algorithm, implement and testing support through Core Data