some mapping changes