updated for xstream