Last rewrites fix + versioning