updating to Todd's new filters