Fixed some Jumping issues.  Much simpler/shorter code and it works better