fixing data pulling