PV2D class modified