FS-3 Added timeout to connection