refactoring in a6