fixed bug, added data