Second Version of OdoCorrection, not fully complete