refactoring and a new case.