Added some NAT code