changes to parsing system