refactored 13