Changed to use xslt