Added Yonatan's changes 28-04-2014