Reworking make_shape method.