Addressed most of the review comments.