massive changes for pvik 3.0.0