prep 2.4
adaptions for version 2.4