Updated all the shapes!