Feedback changes done

Push before merging with master