More work on syntax tree