refactored 67