Added adaptations for code working in NARA