after uri's talk
implemented uri derech's remarks