Addressed reviewer's requests