Added alternate filtering implementation (commented out for now while testing; appears simpler but slower).