Added hexagon and octagon