refactor -change map
introduce jumping