moved other nonprofit and other nonprofile in