few changes in client