Added Ariel's changes