Work on state m/c definition