Revert "Revert "all PC WC""

This reverts commit 9e6bc6bcff7b13dbb7a437e30525f499164934f0.