Start to fixes to jumping