ENH : changing the mapping