Fixed polygons and added circles