last refactoring od auth. module