Changes to the parsing algorithm