Use vector throughout