Converted to comb logic