Firewall proposals reflect changes from 1st stage (@)