Update to include @adgreenway comments