Final NEI integration