Addressed some of the comments