move firewall to firewall formula