updated client and serverHandler