changed filtering logic in main loop, nice performance gains at readability cost\!