made more resilient to server changes