Fatima's comments (fixes #1)