Working on NEI integration.....