refactor and version jump