changing the way nat functions are called
fixing merge conflicts in nat
mapper model
Fixing call from user model for changes in nat mapper model