new design from yaniv - update