Changes on discussion part