na - continued refactoring