re-factor and version jump