discussion and changes