Addressed the last set of comments