Final refinements.