sync with the more minimal current server setup