add truthtable wildcard and expand whole architecture