minor refactoring, fixed crashing after jumping updates