Updated for new jumping stuff