Improve client satisfaction

Improve client satisfaction