Updated State Checker