Updated State Machines and System Monitor