changes after discussion