adapting to current org version