integrated rewiec comments.