Finally working on IVS