modified to client server setup