testing/refactoring