almost done fixing names