Changes from Kai to adapt to changes in text
5 files changed