upgraded to sf 2.6 and removed trianglify