add jump and fix calculate bug