Update with some refinements.