Added remapping to arrows