Some more changes to createMatch func