few changes after discussion