Adding input-match
adding a few things...