Classes edited to give state as well.