adapting to changes on AmmarServer