best i can do to enhance the client model