Added jump handling