added more on wed jun 18 , 17:19