updated parsing tools