still need to fix Vector