P&C Beta upgrades - Shadow stepping 🐱‍👤