Adjust function in client