Remap modified to focus on PoI