Improved OCSInv