Versioning done and crash fixed