Adapted for new omv