Updating the code to work with the new server