A structural fix + rewrites updated
Versioning