Modified to update infos...