Make it work better on the server