More changes to Shapes