Further work on the cylinder shapes.