Made some changes the server