fix data grabbing