Modify for server update