Some re-work to whitelist instead of blacklist.