This version thing is a nightmare waiting to happen. Need to fix.