making progress on remapping