more updates for server transition