more modifications to get rid of XLSTv2 functions