Further refinements and redesign