updated mapping