Updates following @adgreenway comment