Alan's work on the parser