Moved refactored bump code