updated for new Lacona grammar syntax