fixed 1 data point bug
actual combined and compressed version