Reworked shapes.