Rewrote filters - first draft