Added jump argument and some minor changes.