Big change to PCL library (needs more work)