Alireza: Final changes of the first feature(Feedback)

Final changes of the first feature(Feedback)