Better state ID