Merge Jeff T's code for Exclude class