Straightens out the verson mess