adapting to AmmarServer changes