Latest (and hopefully near final) updates to the NAT.