Adding more data, debugging the legend issue