Addressed some comments