edited stuff for name change