ready for xl 2.15+