updated to vector/declare system