modified JADEX version - 2.3