Updated XHTN goals