Addressed final comments