added circles and cylinders