replaced triangle iterator back to Oscars version