updated to reflect minor changes in language definition