Updates for incremental vb, optimization