fixing data management