updated with latest changes to iNZight