rewrites fix 2 + versioning