More refinement....