some changes 30/05/2014 10:00