updated with changes from last iNZight update