updated mapping (part I)