Made changes to fit the server.