added whitelist hack