Update for server3's new setup