Another try at refactoring contents
Case 2