Update from lazare, OCEAN, inv_model