Fixed whitelist and connected