Better state systtem