moved stuff to vectors