Added Improvement from client