add shapes back to new clustering algorithm