Nat: changed the different templates