Changes made by Doug Preston (dgprstn@outlook.com).