Improving a little the sample_data