made some changes to client