modified Parser.cs