more jumping logic added