Susan, your latest PR doeesn't seem to take the above suggestion into account.