Trying to fix versioning hell