This line should go out as well once vector is no longer used.