Addressed comments from Peter.