refactored n/a logic