Major updates to data and XSLT