updated to remove xml