More work on the shake internal state post