Final version of parser