Added Triangles and Hexagon functionality