added some changes in client