Final working draft

Move during jumps should be adjusted ...