Some changes from last meeting 24/08/2014