Changes after discussion