Made changes to finish off Stephen Farrell's DISCUSS.