changes to mapping