Updated the shapes