Changes done on the 17-06-2014