removed jump terms, resetting P and r every jump