Some changes based on comments from Nick and Summer.