Improvement on Client presentation