Some modifs & sample datas