refactored nationality