equality changes in flight to NCDEV
some changes