Addressed some of comments made by Daniel.