Merged the two XSS projects