Worked on filtering some more