Address comments from Peter and taralx