Modified parser.cpp