Rewriting filter stuff and CC interaction!