Minor: this could be a boolean rather than a String