Enhancement of the state machine and enhancement of the client countdown timer