1st modifications for BeDJAY