fixed matching, removed crap