adapting to changes of AmmarServer