added more filtering