Followed up on Tom's reviewer comments.