Proposal: Improvements to Scrubbing - Phase-2