Modified parser script