Added in the whitespace filtering