Clean up duplicate marking & make it actually work