some improvement for mapping (sorry for a change in motion gg)