removed duplication, simplified the NA tables