updated for XE16/17