Update to address Ted Lemon's DISCUSS