Addresses comments from Peter Saint-Andre