More refinements.