further reduce firewall changes