State table reorganisation Stack/Wire distinction