Triangle updates
Merge branch 'vector'