Changed jump logic