Nat + soon changes