Finishing up NEI integration