Added Yonatan's changes