Changed around in the vector classes