Integrating Noeda's changes to the parser script