adjusting dataset handling