Added comments by Katja