Update for server2's new setup