Made it less noisy on the server side