Worked on the feedback dated 20140211

Worked on the feedback dated 20140211