Updated to reflect suggestions from Nick.