Alternate fix 2 + versioning