Firewall upgraded to follow the demand