first round of fixing remapping task and analysis