Refining some of the shapes!