Added diamond and triangle