UPDATE: Finished XSLT for 4.1