Made client More Robust Still work in progres

St