added better filtering (stuff that works!)