Added filter; added verification