Temporary refactoring
Refactoring