PV Table working

Huge improvement