Altered client timeouts.
Integrate new client states.