new data + bug fix