Adapted to AmmarServer changes ..