server and client added