Changes necessary for 7_2_0. Removed seg fault issues. Includes PV