CHanges after discussion