Server modified to use state machine with no actions