Made changes to make versioning more efficient