Fully implemented block whitelists and made the Selector better