making progress on remap #2