removed extra OI stuff