updates to parsing