Addressing all comments