made changes to parser