More stuff to report + state machine updates