OK. I can do the merge, but there is another things which bother us a lot. I think you should look at the other commit I just made. I am so worry about that since we do not have AC matching i.e. we do not have multiset operations.