Improve Client