Rigged up (but less rigged up) control states that work