changed to new xml element names