Removing oj requirement