Addressed comments by Peter.