Changes for the new dataset