changed some thing for client/server communication