final changes according to Kai's annotations