Changes for having it on the server