Add stuff to make scrubbing work fully