Adapt to our data

Adapt to our data