reworked versioning