Added Erian's updated parser stuff