Brought all comments together