Parser after Emmanuel's corrections