Added "Get State" checking