First final version of the mapping