update data and remapping