Updated NEI and CCC so we can remove TMI!