trying to live with minimum amount of safeguards
refactoring, version bump