Changed the timeout from 5 to 10 seconds
Removed code which could be sending timeout twice, reintroducing two clients