fork for IVI 2.0