shapemaker works again
improved names