Updated state handling with some (all?) of the relevant percepts etc.