small refactor and jump change