added ziv and changed soem people