switch to vectors for consistency