Replaced Ariv with Danny
merged conflicts