EG NAL refactored, because the database changed.