jumpto added
fixed merging conflicts