some changes for client