scrub and reorgnization with better scalability