updated parsing