Completed feedback points from 2 to 6

Completed feedback points from 2 to 6