Changes based on review by Matt Esch