Updated to do versioning better