Better data bootstrap