add update and updated createMatch a bit