smooth(er) jumping
merge