added old vector to IteratorClass and a few other modification