trying to remove oce dependence