Improved Circle and Added Cylinder