added ws1
updated server and client