Addressed comments from Peter