Merge changes from Anna, the version I will read through.