Updated XSL for 1.7