Better reporting of state