fixed whitelist and connected