Also updated the XML to be less confusing.