fixing data grab