done fixing up data admin