Redo easymotion mapping