incorporate updated Triangle.vb