reordered
better messages on bump_*