changing the current matching code