Track state better. More examples.