new changes to the server, completely redone