added some more filtering