Moved map to correspond to ns