added scrubber + tests