refactored 11