Better organization for the states.