improve server chose