Improved verify() and c_state()