Changing invalidate to State annotatedish.