Changed to InputFilter