Refactoring. Don't work for now