added Yonatan's changes 10-04-2014