Tighten whitelist call, comment out freezing until we figure it out