Refactoring in progress. Backup