Yeah, good point. I'll try to do so without increasing the combinatorial explosion too much :)