made some changes for client