added data
still has some bugs