Added inital and finding in the match function