Added tri3() and diamond()