Slight changes to OI functions