changes for Xenon