Daniele's Parser, modified