added some new filters, fork to remove