aurora-claire: Suggestion 7 part 2