added jumping
merge