Added state compare support back in.