Change samples, this breaks some tests yes....