added whitelist processing