Update: integrate servers