after Senya Refactoring