New mapping in agreement with the new instructions from Paolo and Giacinto