XPS code revised commit