First round of refinements complete