Yonatan's changes 22-04-2014