rearrange funcs, version bump