Improved ShapeSorter, but not incomplete