changing to reflect changes of AmmarServer